From 5b299ce7af074974a9245d11359360684be90dc4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 20 Dec 2010 10:19:55 -0500
Subject: [PATCH] Remove reference to GTK2_RC_FILES from the docs

Pointed out in bug 637471.
---
 docs/reference/gtk/running.sgml | 9 ---------
 gtk/gtkcssprovider.c            | 8 ++++----
 gtk/gtktestutils.c              | 1 -
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 82a3c2070b..4abbd9d1d9 100644
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -267,15 +267,6 @@ additional environment variables.
   </para>
 </formalpara>
 
-<formalpara>
-  <title><envar>GTK2_RC_FILES</envar></title>
-
-  <para>
-    Specifies a list of RC files to parse instead of the default ones;
-    see <link linkend="gtk-Resource-Files">Resource Files</link>.
-  </para>
-</formalpara>
-
 <formalpara>
   <title><envar>GTK_EXE_PREFIX</envar></title>
 
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 90a50d310a..46303bebe5 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -47,13 +47,13 @@
  * calling gtk_css_provider_load_from_file() and adding the provider with
  * gtk_style_context_add_provider() or gtk_style_context_add_provider_for_screen().
  * In addition, certain files will be read when GTK+ is initialized. First,
- * the file <filename><replaceable>XDG_CONFIG_HOME</replaceable>/gtk-3.0/gtk.css</filename>
+ * the file <filename><envar>$XDG_CONFIG_HOME</envar>/gtk-3.0/gtk.css</filename>
  * is loaded if it exists. Then, GTK+ tries to load
- * <filename><replaceable>HOME</replaceable>/.themes/<replaceable>theme-name</replaceable>/gtk-3.0/gtk.css</filename>,
+ * <filename><envar>$HOME</envar>/.themes/<replaceable>theme-name</replaceable>/gtk-3.0/gtk.css</filename>,
  * falling back to
- * <filename><replaceable>GTK_DATA_PREFIX</replaceable>/share/themes/<replaceable>theme-name</replaceable>/gtk-3.0/gtk.css</filename>,
+ * <filename><replaceable>datadir</replaceable>/share/themes/<replaceable>theme-name</replaceable>/gtk-3.0/gtk.css</filename>,
  * where <replaceable>theme-name</replaceable> is the name of the current theme
- * (see the #GtkSettings:gtk-theme-name setting) and <replaceable>GTK_DATA_PREFIX</replaceable>
+ * (see the #GtkSettings:gtk-theme-name setting) and <replaceable>datadir</datadir>
  * is the prefix configured when GTK+ was compiled, unless overridden by the
  * <envar>GTK_DATA_PREFIX</envar> environment variable.
  * </para>
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index a77ebe726e..d6996ddb14 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -73,7 +73,6 @@ gtk_test_init (int    *argcp,
    * - this function could install a mock object around GtkSettings
    */
   g_setenv ("GTK_MODULES", "", TRUE);
-  g_setenv ("GTK2_RC_FILES", "/dev/null", TRUE);
   gtk_disable_setlocale();
   setlocale (LC_ALL, "C");
   g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=%s");
-- 
2.30.2